Avoid another case of treating None as an atom
authorMatthias Clasen <mclasen@redhat.com>
Sun, 24 May 2009 04:30:58 +0000 (00:30 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 24 May 2009 04:30:58 +0000 (00:30 -0400)
gdk/x11/gdkdnd-x11.c

index 942ad91eb9b33f5088208752960f254f7647cc0a..82ef4422650258cf104ed7543e9642ff5607f139 100644 (file)
@@ -1919,9 +1919,14 @@ static GdkDragAction
 xdnd_action_from_atom (GdkDisplay *display,
                       Atom        xatom)
 {
-  GdkAtom atom = gdk_x11_xatom_to_atom_for_display (display, xatom);
+  GdkAtom atom;
   gint i;
 
+  if (xatom == None)
+    return 0;
+
+  atom = gdk_x11_xatom_to_atom_for_display (display, xatom);
+
   if (!xdnd_actions_initialized)
     xdnd_initialize_actions();